docs: Fix a pile of Docbook validation errors

At least now validates with RNG mode in Emacs.

diff --git a/doc/ostree-admin-config-diff.xml b/doc/ostree-admin-config-diff.xml
index f1d18603d9d648ca1483e31958c937b6c4a6e68d..69209e49659d58a5c89a9ed2652c943b2b913756 100644 (file)
--- a/doc/ostree-admin-config-diff.xml
+++ b/doc/ostree-admin-config-diff.xml
@@ -49,7 +49,7 @@ Boston, MA 02111-1307, USA.
 
     <refsynopsisdiv>
             <cmdsynopsis>
-                <command>ostree admin config-diff <arg choice="opt" rep="repeat">OPTIONS</arg></command>
+                <command>ostree admin config-diff</command> <arg choice="opt" rep="repeat">OPTIONS</arg>
             </cmdsynopsis>
     </refsynopsisdiv>
 
@@ -57,7 +57,7 @@ Boston, MA 02111-1307, USA.
         <title>Description</title>
 
         <para>
-            Prints the differences between the current /etc directory and the default configuration in /usr/etc.  Newly added files (present in /etc but not in /usr/etc) will be prefixed with 'A'. Mnodified files will be prefixed with 'M', and deleted files with 'D'.
+            Prints the differences between the current /etc directory and the default configuration in /usr/etc.  Newly added files (present in /etc but not in /usr/etc) will be prefixed with 'A'. Modified files will be prefixed with 'M', and deleted files with 'D'.
         </para>
     </refsect1>
 
@@ -78,7 +78,9 @@ Boston, MA 02111-1307, USA.
     <refsect1>
         <title>Example</title>
         <para><command>$ ostree admin config-diff</command></para>
+       <programlisting>
         M   shadow
         A   example.txt
+       </programlisting>
     </refsect1>
 </refentry>

diff --git a/doc/ostree-admin-deploy.xml b/doc/ostree-admin-deploy.xml
index f08f443a278f7fd034ee0eb7d5cb400e623de9ce..ef96203ce62d8f5fcb1b8ba605c31b827019e31a 100644 (file)
--- a/doc/ostree-admin-deploy.xml
+++ b/doc/ostree-admin-deploy.xml
@@ -49,7 +49,7 @@ Boston, MA 02111-1307, USA.
 
     <refsynopsisdiv>
             <cmdsynopsis>
-                <command>ostree admin deploy <arg choice="opt" rep="repeat">OPTIONS</arg> <arg choice="req">REFSPEC</arg> </command>
+                <command>ostree admin deploy</command> <arg choice="opt" rep="repeat">OPTIONS</arg> <arg choice="req">REFSPEC</arg>
             </cmdsynopsis>
     </refsynopsisdiv>
 
@@ -118,21 +118,27 @@ Boston, MA 02111-1307, USA.
     <refsect1>
         <title>Example</title>
         <para><command>$ ostree admin status</command></para>
+<programlisting>
         * gnome-ostree 67e382b11d213a402a5313e61cbc69dfd5ab93cb07.0
             origin refspec: gnome-ostree/buildmaster/x86_64-runtime
           gnome-ostree ce19c41036cc45e49b0cecf6b157523c2105c4de1ce3.0
             origin refspec: gnome-ostree/buildmaster/x86_64-runtime
+</programlisting>
 
 <para><command>$ ostree admin deploy gnome-ostree/buildmaster/x86_64-runtime</command></para>
+<programlisting>
         ostadmin: Creating deployment /ostree/deploy/gnome-ostree/deploy/7e382b11d213a402a5313e61cbc69dfd5ab93cb07.1
         ostadmin: Processing /etc: 3 modified, 0 removed, 29 added
         Transaction complete: bootconfig swap: no deployment count change: 0)
+</programlisting>
 
 <para><command>$ ostree admin status</command></para>
+<programlisting>
           gnome-ostree 67e382b11d213a402a5313e61cbc69dfd5ab93cb07.1
             origin refspec: gnome-ostree/buildmaster/x86_64-runtime
         * gnome-ostree 67e382b11d213a402a5313e61cbc69dfd5ab93cb07.0
             origin refspec: gnome-ostree/buildmaster/x86_64-runtime
+</programlisting>
     
     </refsect1>
 </refentry>

diff --git a/doc/ostree-admin-init-fs.xml b/doc/ostree-admin-init-fs.xml
index bac7ca424fdeff72f7aedc5d74c99d00c4926bc7..034eafb4436727e0557218c26b725bcbec583849 100644 (file)
--- a/doc/ostree-admin-init-fs.xml
+++ b/doc/ostree-admin-init-fs.xml
@@ -49,7 +49,7 @@ Boston, MA 02111-1307, USA.
 
     <refsynopsisdiv>
             <cmdsynopsis>
-                <command>ostree admin init-fs <arg choice="opt" rep="repeat">OPTIONS</arg> <arg choice="req">PATH</arg> </command>
+                <command>ostree admin init-fs</command> <arg choice="opt" rep="repeat">OPTIONS</arg> <arg choice="req">PATH</arg>
             </cmdsynopsis>
     </refsynopsisdiv>
 
@@ -67,7 +67,7 @@ Boston, MA 02111-1307, USA.
         <para><command>$ ostree admin init-fs /example</command></para>
         <para><command>$ ls /example </command></para>
         <para>
-            <emphasis type="bold">boot</emphasis>&nbsp;&nbsp; <emphasis type="bold">dev</emphasis>&nbsp;&nbsp; <emphasis type="bold">home</emphasis>&nbsp;&nbsp; <emphasis type="bold">ostree</emphasis>&nbsp;&nbsp; <emphasis type="bold">proc</emphasis>&nbsp;&nbsp; <emphasis type="bold">root</emphasis>&nbsp;&nbsp; <emphasis type="bold">run</emphasis>&nbsp;&nbsp; <emphasis type="bold">sys</emphasis>&nbsp;&nbsp; <emphasis type="bold">tmp</emphasis>
+            <emphasis>boot</emphasis>&nbsp;&nbsp; <emphasis>dev</emphasis>&nbsp;&nbsp; <emphasis>home</emphasis>&nbsp;&nbsp; <emphasis>ostree</emphasis>&nbsp;&nbsp; <emphasis>proc</emphasis>&nbsp;&nbsp; <emphasis>root</emphasis>&nbsp;&nbsp; <emphasis>run</emphasis>&nbsp;&nbsp; <emphasis>sys</emphasis>&nbsp;&nbsp; <emphasis>tmp</emphasis>
         </para>
     </refsect1>
 </refentry>

diff --git a/doc/ostree-admin-instutil.xml b/doc/ostree-admin-instutil.xml
index 4f2ff164a5485099c29f1b8021d25d0a8c62f7df..94894c10c0fe6c72d36ad15cd7b905da89ba0000 100644 (file)
--- a/doc/ostree-admin-instutil.xml
+++ b/doc/ostree-admin-instutil.xml
@@ -49,7 +49,7 @@ Boston, MA 02111-1307, USA.
 
     <refsynopsisdiv>
             <cmdsynopsis>
-                <command>ostree admin instutil <arg choice="req">SUBCOMMAND</arg> <arg choice="opt">ARGS</arg></command>
+                <command>ostree admin instutil</command> <arg choice="req">SUBCOMMAND</arg> <arg choice="opt">ARGS</arg>
             </cmdsynopsis>
     </refsynopsisdiv>
 
@@ -67,7 +67,7 @@ Boston, MA 02111-1307, USA.
 
         <variablelist>
             <varlistentry>
-                <term><command>selinux-ensure-labeled <arg choice="opt">SUBPATH PREFIX</arg></command></term>
+                <term><cmdsynopsis><command>selinux-ensure-labeled</command> <arg choice="opt">SUBPATH PREFIX</arg></cmdsynopsis></term>
 
                 <listitem><para>
                     Ensure all files and directories are labeled according to SELinux policy of the first deployment.
@@ -75,7 +75,8 @@ Boston, MA 02111-1307, USA.
             </varlistentry>
 
             <varlistentry>
-                <term><command>set-kargs <arg choice="opt">--merge</arg> <arg choice="opt">--import-proc-cmdline</arg> <arg choice="opt">--append="NAME=VALUE"</arg> <arg choice="opt">--replace="NAME=VALUE"</arg> <arg choice="opt">MORE_APPEND_ARGS</arg></command></term>
+                <term><cmdsynopsis>
+<command>set-kargs</command> <arg choice="opt">--merge</arg> <arg choice="opt">--import-proc-cmdline</arg> <arg choice="opt">--append="NAME=VALUE"</arg> <arg choice="opt">--replace="NAME=VALUE"</arg> <arg choice="opt">MORE_APPEND_ARGS</arg></cmdsynopsis></term>
 
                 <listitem><para>
                     Replace the kernel arguments of the default deployment. The new arguments are based

diff --git a/doc/ostree-admin-os-init.xml b/doc/ostree-admin-os-init.xml
index 3dbc900c0831775eefd875c7d86beb6fc54f5283..77bd126af960dca33051b0c46081e4387fbe7dfb 100644 (file)
--- a/doc/ostree-admin-os-init.xml
+++ b/doc/ostree-admin-os-init.xml
@@ -49,7 +49,7 @@ Boston, MA 02111-1307, USA.
 
     <refsynopsisdiv>
             <cmdsynopsis>
-                <command>ostree admin os-init <arg choice="req">OSNAME</arg></command>
+                <command>ostree admin os-init</command> <arg choice="req">OSNAME</arg>
             </cmdsynopsis>
     </refsynopsisdiv>
 
@@ -64,6 +64,8 @@ Boston, MA 02111-1307, USA.
     <refsect1>
         <title>Example</title>
         <para><command>$ ostree admin os-init gnome-ostree</command></para>
+    <programlisting>
         ostree/deploy/gnome-ostree initialized as OSTree root
+    </programlisting>
     </refsect1>
 </refentry>

diff --git a/doc/ostree-admin-status.xml b/doc/ostree-admin-status.xml
index 599d47fd3d0303cb864f1f43969ca5b08fb3d850..0ffd4c5bc94153b1c354e0be799845a31f5f534d 100644 (file)
--- a/doc/ostree-admin-status.xml
+++ b/doc/ostree-admin-status.xml
@@ -64,10 +64,11 @@ Boston, MA 02111-1307, USA.
     <refsect1>
         <title>Example</title>
         <para><command>$ ostree admin status</command></para>
+<programlisting>
         * gnome-ostree 67e382b11d213a402a5313e61cbc69dfd5ab93cb07.0
             origin refspec: gnome-ostree/buildmaster/x86_64-runtime
           gnome-ostree ce19c41036cc45e49b0cecf6b157523c2105c4de1c.0
             origin refspec: gnome-ostree/buildmaster/x86_64-runtime
-
+</programlisting>
     </refsect1>
 </refentry>

diff --git a/doc/ostree-admin-switch.xml b/doc/ostree-admin-switch.xml
index e26da1bc6fdb70df2ece97e57a0a40bfa0044b14..8072d6b92c123524953409082a8340ea5847e234 100644 (file)
--- a/doc/ostree-admin-switch.xml
+++ b/doc/ostree-admin-switch.xml
@@ -49,7 +49,7 @@ Boston, MA 02111-1307, USA.
 
     <refsynopsisdiv>
             <cmdsynopsis>
-                <command>ostree admin switch <arg choice="req">REF</arg> </command>
+                <command>ostree admin switch</command> <arg choice="req">REF</arg>
             </cmdsynopsis>
     </refsynopsisdiv>
 

diff --git a/doc/ostree-admin-undeploy.xml b/doc/ostree-admin-undeploy.xml
index 98e72f1c55e3806bd5965a2ee943f02b9bda2a21..155c5ec837c952cbe7dffd0a791030a000ef8094 100644 (file)
--- a/doc/ostree-admin-undeploy.xml
+++ b/doc/ostree-admin-undeploy.xml
@@ -49,7 +49,7 @@ Boston, MA 02111-1307, USA.
 
     <refsynopsisdiv>
             <cmdsynopsis>
-                <command>ostree admin undeploy <arg choice="req">INDEX</arg></command>
+                <command>ostree admin undeploy</command> <arg choice="req">INDEX</arg>
             </cmdsynopsis>
     </refsynopsisdiv>
 
@@ -64,16 +64,22 @@ Boston, MA 02111-1307, USA.
     <refsect1>
         <title>Example</title>
         <para><command>$ ostree admin status</command></para>
+<programlisting>
         * gnome-ostree 67e382b11d213a402a5313e61cbc69dfd5ab93cb07.0
             origin refspec: gnome-ostree/buildmaster/x86_64-runtime
           gnome-ostree ce19c41036cc45e49b0cecf6b157523c2105c4de1c.0
             origin refspec: gnome-ostree/buildmaster/x86_64-runtime
+</programlisting>
 <para><command>$ ostree admin undeploy 1</command></para>
+<programlisting>
         Transaction complete; bootconfig swap: no deployment count change: -1)
         Freed objects: 326.5 kB
         Deleted deployment ce19c41036cc45e49b0cecf6b157523c2105c4de1c.0
+</programlisting>
 <para><command>$ ostree admin status</command></para>
+<programlisting>
         * gnome-ostree 67e382b11d213a402a5313e61cbc69dfd5ab93cb07.0
             origin refspec: gnome-ostree/buildmaster/x86_64-runtime
+</programlisting>
     </refsect1>
 </refentry>

diff --git a/doc/ostree-admin-upgrade.xml b/doc/ostree-admin-upgrade.xml
index 01050a560df178c7e1c038b36fdf1c4580740b16..37e3e5d24b3b7d2ad81e10f55cea2d67ab5aa505 100644 (file)
--- a/doc/ostree-admin-upgrade.xml
+++ b/doc/ostree-admin-upgrade.xml
@@ -49,7 +49,7 @@ Boston, MA 02111-1307, USA.
 
     <refsynopsisdiv>
             <cmdsynopsis>
-                <command>ostree admin upgrade <arg choice="opt" rep="repeat">OPTIONS</arg></command>
+                <command>ostree admin upgrade</command> <arg choice="opt" rep="repeat">OPTIONS</arg>
             </cmdsynopsis>
     </refsynopsisdiv>
 
@@ -95,6 +95,8 @@ Boston, MA 02111-1307, USA.
     <refsect1>
         <title>Example</title>
         <para><command>$ ostree admin upgrade</command></para>
+<programlisting>
         No update available.
+</programlisting>
     </refsect1>
 </refentry>

diff --git a/doc/ostree-admin.xml b/doc/ostree-admin.xml
index 0878c7283a6756aea79e0c030e2090fd6d1438cb..fd75b5652db30d39b2203c55a1b4b319334f4626 100644 (file)
--- a/doc/ostree-admin.xml
+++ b/doc/ostree-admin.xml
@@ -49,7 +49,7 @@ Boston, MA 02111-1307, USA.
 
     <refsynopsisdiv>
             <cmdsynopsis>
-                <command>ostree admin <arg choice="req">SUBCOMMAND</arg></command>
+                <command>ostree admin</command> <arg choice="req">SUBCOMMAND</arg>
             </cmdsynopsis>
     </refsynopsisdiv>
 
@@ -64,18 +64,18 @@ Boston, MA 02111-1307, USA.
     <refsect1>
         <title>Subcommands</title>
 
-        <variablelist>
-            <varlistentry><term><command>cleanup</command></term></varlistentry>
-            <varlistentry><term><command>config-diff</command></term></varlistentry>
-            <varlistentry><term><command>deploy</command></term></varlistentry>
-            <varlistentry><term><command>init-fs</command></term></varlistentry>
-            <varlistentry><term><command>instutil</command></term></varlistentry>
-            <varlistentry><term><command>os-init</command></term></varlistentry>
-            <varlistentry><term><command>status</command></term></varlistentry>
-            <varlistentry><term><command>switch</command></term></varlistentry>
-            <varlistentry><term><command>undeploy</command></term></varlistentry>
-            <varlistentry><term><command>upgrade</command></term></varlistentry>            
-        </variablelist>
+        <itemizedlist>
+            <listitem><para><command>cleanup</command></para></listitem>
+            <listitem><para><command>config-diff</command></para></listitem>
+            <listitem><para><command>deploy</command></para></listitem>
+            <listitem><para><command>init-fs</command></para></listitem>
+            <listitem><para><command>instutil</command></para></listitem>
+            <listitem><para><command>os-init</command></para></listitem>
+            <listitem><para><command>status</command></para></listitem>
+            <listitem><para><command>switch</command></para></listitem>
+            <listitem><para><command>undeploy</command></para></listitem>
+            <listitem><para><command>upgrade</command></para></listitem>            
+        </itemizedlist>
 
         <para>
             View manpages for each admin subcommand using, for example:

diff --git a/doc/ostree-cat.xml b/doc/ostree-cat.xml
index 068c0e1504d7bc28e0081ad7b1a9680a6b62aee8..425ac26a44fa8f0130eb36b7e7de9a005871038a 100644 (file)
--- a/doc/ostree-cat.xml
+++ b/doc/ostree-cat.xml
@@ -49,7 +49,7 @@ Boston, MA 02111-1307, USA.
 
     <refsynopsisdiv>
             <cmdsynopsis>
-                <command>ostree cat <arg choice="req">COMMIT</arg> <arg choice="req" rep="repeat">PATH</arg></command>
+                <command>ostree cat</command> <arg choice="req">COMMIT</arg> <arg choice="req" rep="repeat">PATH</arg>
             </cmdsynopsis>
     </refsynopsisdiv>
 
@@ -65,6 +65,8 @@ Boston, MA 02111-1307, USA.
     <refsect1>
         <title>Example</title>
         <para><command>$ ostree cat my-branch helloworld.txt</command></para>
+<programlisting>
         Hello, world!
+</programlisting>
     </refsect1>
 </refentry>

diff --git a/doc/ostree-checkout.xml b/doc/ostree-checkout.xml
index d1205e1f584ea8b69b188f1fe0bf1b77b0f66bd0..67d6469effa09f958cf3d4966fc08c29e94e7a07 100644 (file)
--- a/doc/ostree-checkout.xml
+++ b/doc/ostree-checkout.xml
@@ -49,7 +49,7 @@ Boston, MA 02111-1307, USA.
 
     <refsynopsisdiv>
             <cmdsynopsis>
-                <command>ostree checkout <arg choice="opt" rep="repeat">OPTIONS</arg> <arg choice="req">COMMIT</arg> <arg choice="opt">DESTINATION</arg></command>
+                <command>ostree checkout</command> <arg choice="opt" rep="repeat">OPTIONS</arg> <arg choice="req">COMMIT</arg> <arg choice="opt">DESTINATION</arg>
             </cmdsynopsis>
     </refsynopsisdiv>
 
@@ -120,6 +120,8 @@ Boston, MA 02111-1307, USA.
         <title>Example</title>
         <para><command>$ ostree checkout my-branch</command></para>
         <para><command>$ ls</command></para>
-        file1&nbsp;&nbsp;&nbsp;&nbsp;file2&nbsp;&nbsp;&nbsp;&nbsp;<emphasis type="bold">my-branch</emphasis>
+<programlisting>
+        file1&nbsp;&nbsp;&nbsp;&nbsp;file2&nbsp;&nbsp;&nbsp;&nbsp;<emphasis>my-branch</emphasis>
+</programlisting>
     </refsect1>
 </refentry>

diff --git a/doc/ostree-checksum.xml b/doc/ostree-checksum.xml
index c4b5bee960676846bb2b717031f81348d4050692..53914782e6a716c5bb2adc3c925d529f154a976e 100644 (file)
--- a/doc/ostree-checksum.xml
+++ b/doc/ostree-checksum.xml
@@ -49,7 +49,7 @@ Boston, MA 02111-1307, USA.
 
     <refsynopsisdiv>
             <cmdsynopsis>
-                <command>ostree checksum <arg choice="req">PATH</arg></command>
+                <command>ostree checksum</command> <arg choice="req">PATH</arg>
             </cmdsynopsis>
     </refsynopsisdiv>
 
@@ -64,6 +64,8 @@ Boston, MA 02111-1307, USA.
     <refsect1>
         <title>Example</title>
         <para><command>$ ostree checksum file1</command></para>
+<programlisting>
         67e382b11d213a402a5313e61cbc69dfd5ab93cb07fbb8b71c2e84f79fa5d7dc
+</programlisting>
     </refsect1>
 </refentry>

diff --git a/doc/ostree-commit.xml b/doc/ostree-commit.xml
index 995a84feba5e4c9bf8b1af32de2133021a97efa8..440e77c124da2eefeae54dee1332ab2ba0765c90 100644 (file)
--- a/doc/ostree-commit.xml
+++ b/doc/ostree-commit.xml
@@ -49,7 +49,7 @@ Boston, MA 02111-1307, USA.
 
     <refsynopsisdiv>
             <cmdsynopsis>
-                <command>ostree commit <arg choice="opt" rep="repeat">OPTIONS</arg> --branch=<arg choice="req">BRANCH</arg> <arg choice="opt">PATH</arg></command>
+                <command>ostree commit</command> <arg choice="opt" rep="repeat">OPTIONS</arg> --branch=<arg choice="req">BRANCH</arg> <arg choice="opt">PATH</arg>
             </cmdsynopsis>
     </refsynopsisdiv>
 
@@ -204,6 +204,8 @@ Boston, MA 02111-1307, USA.
     <refsect1>
         <title>Example</title>
         <para><command>$ ostree commit --branch=my-branch --subject="Initial commit"</command></para>
+<programlisting>
         67e382b11d213a402a5313e61cbc69dfd5ab93cb07fbb8b71c2e84f79fa5d7dc
+</programlisting>
     </refsect1>
 </refentry>

diff --git a/doc/ostree-config.xml b/doc/ostree-config.xml
index b0c0d48bb0a614e48f5cfcc654a32a7a5fab1920..715bebbc95fd033f4d1b99e3fed90762daee730e 100644 (file)
--- a/doc/ostree-config.xml
+++ b/doc/ostree-config.xml
@@ -49,10 +49,10 @@ Boston, MA 02111-1307, USA.
 
     <refsynopsisdiv>
             <cmdsynopsis>
-                <command>ostree config get <arg choice="req">SECTIONNAME.KEYNAME</arg></command>
+                <command>ostree config get</command> <arg choice="req">SECTIONNAME.KEYNAME</arg>
             </cmdsynopsis>
             <cmdsynopsis>
-                <command>ostree config set <arg choice="req">SECTIONNAME.KEYNAME</arg> <arg choice="req">VALUE</arg></command>
+                <command>ostree config set</command> <arg choice="req">SECTIONNAME.KEYNAME</arg> <arg choice="req">VALUE</arg>
             </cmdsynopsis>
     </refsynopsisdiv>
 

diff --git a/doc/ostree-diff.xml b/doc/ostree-diff.xml
index baaa343a681fe48024c0954025d8ab6c7e69cfdc..aaa76b13729def974e4ea2c64ac4f4d59cd00a76 100644 (file)
--- a/doc/ostree-diff.xml
+++ b/doc/ostree-diff.xml
@@ -49,7 +49,7 @@ Boston, MA 02111-1307, USA.
 
     <refsynopsisdiv>
             <cmdsynopsis>
-                <command>ostree diff <arg choice="opt" rep="repeat">OPTIONS</arg> <arg choice="req">REV</arg> <arg choice="req">TARGETDIR</arg></command>
+                <command>ostree diff</command> <arg choice="opt" rep="repeat">OPTIONS</arg> <arg choice="req">REV</arg> <arg choice="req">TARGETDIR</arg>
             </cmdsynopsis>
     </refsynopsisdiv>
 
@@ -84,10 +84,14 @@ Boston, MA 02111-1307, USA.
     <refsect1>
         <title>Example</title>
         <para><command>$ ostree diff my-branch^ my-branch</command></para>
+<programlisting>
         A   /testdirectory
         M   /helloworld.txt
+</programlisting>
 <para><command>$ ostree diff my-branch my-branch^</command></para>
+<programlisting>
         D   /testdirectory
         M   /helloworld.txt
+</programlisting>
     </refsect1>
-</refentry>
\ No newline at end of file
+</refentry>

diff --git a/doc/ostree-fsck.xml b/doc/ostree-fsck.xml
index c93166b849e78dd577a0cd91d83059e5b99203f6..68107f5352ecf83378af4a0654264398e6c4bff4 100644 (file)
--- a/doc/ostree-fsck.xml
+++ b/doc/ostree-fsck.xml
@@ -49,7 +49,7 @@ Boston, MA 02111-1307, USA.
 
     <refsynopsisdiv>
             <cmdsynopsis>
-                <command>ostree fsck <arg choice="opt" rep="repeat">OPTIONS</arg></command>
+                <command>ostree fsck</command><arg choice="opt" rep="repeat">OPTIONS</arg>
             </cmdsynopsis>
     </refsynopsisdiv>
 
@@ -85,9 +85,11 @@ Boston, MA 02111-1307, USA.
     <refsect1>
         <title>Example</title>
         <para><command>$ ostree fsck</command></para>
+<programlisting>
         Enumerating objects...
         Verifying content integrity of of 2 commit objects
         0/2572 objects
         2571/2572 objects
+</programlisting>
     </refsect1>
 </refentry>

diff --git a/doc/ostree-init.xml b/doc/ostree-init.xml
index ec1962c0cb6d43225a9f2e3d8b84877b065a6584..4518e244e9edbd168b988ca83ddf53fcebc9b0db 100644 (file)
--- a/doc/ostree-init.xml
+++ b/doc/ostree-init.xml
@@ -49,7 +49,7 @@ Boston, MA 02111-1307, USA.
 
     <refsynopsisdiv>
             <cmdsynopsis>
-                <command>ostree init <arg choice="opt" rep="repeat">OPTIONS</arg></command>
+                <command>ostree init</command> <arg choice="opt" rep="repeat">OPTIONS</arg>
             </cmdsynopsis>
     </refsynopsisdiv>
 

diff --git a/doc/ostree-log.xml b/doc/ostree-log.xml
index 51d2caf0cc49744b072b685e2e2459ea13af48df..4c23b0d587efecccc8b4dd8545c52c4a14ba9b7c 100644 (file)
--- a/doc/ostree-log.xml
+++ b/doc/ostree-log.xml
@@ -49,7 +49,7 @@ Boston, MA 02111-1307, USA.
 
     <refsynopsisdiv>
             <cmdsynopsis>
-                <command>ostree log <arg choice="opt" rep="repeat">OPTIONS</arg> <arg choice="req">REF</arg></command>
+                <command>ostree log</command> <arg choice="opt" rep="repeat">OPTIONS</arg> <arg choice="req">REF</arg>
             </cmdsynopsis>
     </refsynopsisdiv>
 
@@ -77,6 +77,7 @@ Boston, MA 02111-1307, USA.
     <refsect1>
         <title>Example</title>
         <para><command>$ ostree log my-branch</command></para>
+<programlisting>
         commit 67e382b11d213a402a5313e61cbc69dfd5ab93cb07fbb8b71c2e84f79fa5d7dc
         Date:  2014-06-12 13:42:54 +0000
             This is the second commit
@@ -84,6 +85,7 @@ Boston, MA 02111-1307, USA.
         commit ce19c41036cc45e49b0cecf6b157523c2105c4de1ce30101def1f759daafcc3e
         Date:  2014-06-12 11:20:08 +0000
             Initial commit
+</programlisting>
 
     </refsect1>
 </refentry>

diff --git a/doc/ostree-ls.xml b/doc/ostree-ls.xml
index d67e7d7425e8b86d6ce6eb70f18db258f9c91882..9378759be53256730b61d2da6cc3ded8cff1b034 100644 (file)
--- a/doc/ostree-ls.xml
+++ b/doc/ostree-ls.xml
@@ -49,7 +49,7 @@ Boston, MA 02111-1307, USA.
 
     <refsynopsisdiv>
             <cmdsynopsis>
-                <command>ostree ls <arg choice="opt" rep="repeat">OPTIONS</arg> <arg choice="req">COMMIT</arg> <arg choice="opt" rep="repeat">PATHS</arg></command>
+                <command>ostree ls</command> <arg choice="opt" rep="repeat">OPTIONS</arg> <arg choice="req">COMMIT</arg> <arg choice="opt" rep="repeat">PATHS</arg>
             </cmdsynopsis>
     </refsynopsisdiv>
 
@@ -106,9 +106,11 @@ Boston, MA 02111-1307, USA.
     <refsect1>
         <title>Example</title>
         <para><command>$ ostree ls my-branch</command></para>
+<programlisting>
         d00644 0 0    0 /
         -00644 0 0    2 /helloworld.txt
         d00755 0 0    0 /testdirectory
+</programlisting>
 
 <para>Here, the first column is the file-type symbol (as explained in the DESCRIPTION section) followed by the S_IFMT file type.  The next two columns (here: 0 0) are respectively the user ID and group ID for the file.  After the break, the next number represents that file's standard size.  The final column is the file path.</para>
     </refsect1>

diff --git a/doc/ostree-prune.xml b/doc/ostree-prune.xml
index 08bd8c2216e9325fecab7c4e462153edd102defe..523b7225cc1ae55122e066b574e3914dc9f5efdf 100644 (file)
--- a/doc/ostree-prune.xml
+++ b/doc/ostree-prune.xml
@@ -49,7 +49,7 @@ Boston, MA 02111-1307, USA.
 
     <refsynopsisdiv>
             <cmdsynopsis>
-                <command>ostree prune <arg choice="opt" rep="repeat">OPTIONS</arg></command>
+                <command>ostree prune</command> <arg choice="opt" rep="repeat">OPTIONS</arg>
             </cmdsynopsis>
     </refsynopsisdiv>
 
@@ -95,7 +95,9 @@ Boston, MA 02111-1307, USA.
     <refsect1>
         <title>Example</title>
         <para><command>$ ostree prune</command></para>
+<programlisting>
         Total objects: 25627
         No unreachable objects
+</programlisting>
     </refsect1>
 </refentry>

diff --git a/doc/ostree-pull-local.xml b/doc/ostree-pull-local.xml
index 662bbaa84d6ad547274bc56d428c7f501c60133a..2ecd12c1750797c3c2328762e9ede3f41e7761aa 100644 (file)
--- a/doc/ostree-pull-local.xml
+++ b/doc/ostree-pull-local.xml
@@ -49,7 +49,7 @@ Boston, MA 02111-1307, USA.
 
     <refsynopsisdiv>
             <cmdsynopsis>
-                <command>ostree pull-local <arg choice="opt" rep="repeat">OPTIONS</arg> <arg choice="req">SOURCE_REPO</arg> <arg choice="opt" rep="repeat">REFS</arg> </command>
+                <command>ostree pull-local</command> <arg choice="opt" rep="repeat">OPTIONS</arg> <arg choice="req">SOURCE_REPO</arg> <arg choice="opt" rep="repeat">REFS</arg>
             </cmdsynopsis>
     </refsynopsisdiv>
 
@@ -87,8 +87,10 @@ Boston, MA 02111-1307, USA.
     <refsect1>
         <title>Example</title>
         <para><command>$ ostree pull-local /ostree/repo</command></para>
+<programlisting>
         Enumerating objects...
         pull: 25709/25709 scanned, 0 objects copied
         Writing 5 refs
+</programlisting>
     </refsect1>
 </refentry>

diff --git a/doc/ostree-refs.xml b/doc/ostree-refs.xml
index 77f226be4e723af496e4b73aa6d9e438d5bc6b86..4a33cd324cd5e44b5de9f8e8c13d53466dbb1c64 100644 (file)
--- a/doc/ostree-refs.xml
+++ b/doc/ostree-refs.xml
@@ -49,7 +49,7 @@ Boston, MA 02111-1307, USA.
 
     <refsynopsisdiv>
             <cmdsynopsis>
-                <command>ostree refs <arg choice="opt" rep="repeat">OPTIONS</arg> <arg choice="opt">PREFIX</arg></command>
+                <command>ostree refs</command> <arg choice="opt" rep="repeat">OPTIONS</arg> <arg choice="opt">PREFIX</arg>
             </cmdsynopsis>
     </refsynopsisdiv>
 
@@ -78,7 +78,9 @@ Boston, MA 02111-1307, USA.
     <refsect1>
         <title>Example</title>
         <para><command>$ ostree refs</command></para>
+<programlisting>
         my-branch
         gnome-ostree/buildmaster/x86_64-runtime
+</programlisting>
     </refsect1>
 </refentry>

diff --git a/doc/ostree-remote.xml b/doc/ostree-remote.xml
index e42178f19f9e0a18219c348b86bd338775299e04..a9aa97420b23f77caa2fecd6e62f07600aa5a163 100644 (file)
--- a/doc/ostree-remote.xml
+++ b/doc/ostree-remote.xml
@@ -49,13 +49,13 @@ Boston, MA 02111-1307, USA.
 
     <refsynopsisdiv>
             <cmdsynopsis>
-                <command>ostree remote <arg choice="opt" rep="repeat">OPTIONS</arg> add <arg choice="req">NAME</arg> <arg choice="req">URL</arg> <arg choice="opt" rep="repeat">BRANCH</arg></command>
+                <command>ostree remote</command> <arg choice="opt" rep="repeat">OPTIONS</arg> add <arg choice="req">NAME</arg> <arg choice="req">URL</arg> <arg choice="opt" rep="repeat">BRANCH</arg>
             </cmdsynopsis>
             <cmdsynopsis>
-                <command>ostree remote delete <arg choice="req">NAME</arg></command>
+                <command>ostree remote delete</command> <arg choice="req">NAME</arg>
             </cmdsynopsis>
             <cmdsynopsis>
-                <command>ostree remote show-url <arg choice="req">NAME</arg></command>
+                <command>ostree remote show-url</command> <arg choice="req">NAME</arg>
             </cmdsynopsis>
     </refsynopsisdiv>
 
@@ -92,6 +92,8 @@ Boston, MA 02111-1307, USA.
     <refsect1>
         <title>Example</title>
         <para><command>$ ostree remote show-url local</command></para>
+<programlisting>
         http://192.168.122.1/repo
+</programlisting>
     </refsect1>
 </refentry>

diff --git a/doc/ostree-reset.xml b/doc/ostree-reset.xml
index 5d2d6b9a4d3a52ee21010ea2adf07765da4ce3f1..6d80ccd9fc59b685f3c026d8081ff5d5d242ad21 100644 (file)
--- a/doc/ostree-reset.xml
+++ b/doc/ostree-reset.xml
@@ -49,7 +49,7 @@ Boston, MA 02111-1307, USA.
 
     <refsynopsisdiv>
             <cmdsynopsis>
-                <command>ostree reset <arg choice="req">REF</arg> <arg choice="req">REF_TO_RESET_TO</arg> </command>
+                <command>ostree reset </command> <arg choice="req">REF</arg> <arg choice="req">REF_TO_RESET_TO</arg>
             </cmdsynopsis>
     </refsynopsisdiv>
 
@@ -64,6 +64,7 @@ Boston, MA 02111-1307, USA.
     <refsect1>
         <title>Example</title>
         <para><command>$ ostree log my-branch</command></para>
+<programlisting>
         commit 67e382b11d213a402a5313e61cbc69dfd5ab93cb07
         Date:  2014-06-12 13:42:54 +0000
             This is the second commit
@@ -71,11 +72,14 @@ Boston, MA 02111-1307, USA.
         commit ce19c41036cc45e49b0cecf6b157523c2105c4de1c
         Date:  2014-06-12 11:20:08 +0000
             Initial commit
+</programlisting>
 
 <para><command>$ ostree reset my-branch my-branch^</command></para>
         <para><command>$ ostree log my-branch</command></para>
+<programlisting>
         commit ce19c41036cc45e49b0cecf6b157523c2105c4de1c
         Date:  2014-06-12 11:20:08 +0000
             Initial commit
+</programlisting>
     </refsect1>
 </refentry>

diff --git a/doc/ostree-rev-parse.xml b/doc/ostree-rev-parse.xml
index a66fa70995d67120449250f50aea7d5864b4752d..c8c026293344cc15e8a08051a00f80c6f8918d85 100644 (file)
--- a/doc/ostree-rev-parse.xml
+++ b/doc/ostree-rev-parse.xml
@@ -49,7 +49,7 @@ Boston, MA 02111-1307, USA.
 
     <refsynopsisdiv>
             <cmdsynopsis>
-                <command>ostree rev-parse <arg choice="req">REV</arg> <arg choice="req">PATH</arg> </command>
+                <command>ostree rev-parse </command> <arg choice="req">REV</arg> <arg choice="req">PATH</arg>
             </cmdsynopsis>
     </refsynopsisdiv>
 
@@ -66,6 +66,8 @@ Boston, MA 02111-1307, USA.
     <refsect1>
         <title>Example</title>
         <para><command>$ ostree rev-parse my-branch</command></para>
+<programlisting>
         ce19c41036cc45e49b0cecf6b157523c2105c4de1ce30101def1f759daafcc3e
+</programlisting>
     </refsect1>
 </refentry>

diff --git a/doc/ostree-show.xml b/doc/ostree-show.xml
index df573f8cfaddf3a6562baac7b951bd819911d0d5..8b012e5c479d2b3898fffc6da16d4ec9bf7564a9 100644 (file)
--- a/doc/ostree-show.xml
+++ b/doc/ostree-show.xml
@@ -49,7 +49,7 @@ Boston, MA 02111-1307, USA.
 
     <refsynopsisdiv>
             <cmdsynopsis>
-                <command>ostree show <arg choice="opt" rep="repeat">OPTIONS</arg> <arg choice="req">OBJECT</arg></command>
+                <command>ostree show</command> <arg choice="opt" rep="repeat">OPTIONS</arg> <arg choice="req">OBJECT</arg>
             </cmdsynopsis>
     </refsynopsisdiv>
 
@@ -77,7 +77,7 @@ Boston, MA 02111-1307, USA.
                 <term><option>--print-variant-type</option>="TYPE"</term>
 
                 <listitem><para>
-                    Memory map <arg choice="req">OBJECT</arg> (in this case a filename) to the GVariant type string.
+                    Memory map <replaceable>OBJECT</replaceable> (in this case a filename) to the GVariant type string.
                 </para></listitem>
             </varlistentry>
 
@@ -110,7 +110,9 @@ Boston, MA 02111-1307, USA.
     <refsect1>
         <title>Example</title>
         <para><command>$ ostree show my-branch</command></para>
+<programlisting>
         commit 67e382b11d213a402a5313e61cbc69dfd5ab93cb07
         Date:  2014-06-12 13:42:54 +0000
+</programlisting>
     </refsect1>
 </refentry>

diff --git a/doc/ostree-static-delta.xml b/doc/ostree-static-delta.xml
index b28b4ed6734e15287d138d5cf0d57b696378ee09..6309a09c2ea9dce2439b7509536dfb40f247c976 100644 (file)
--- a/doc/ostree-static-delta.xml
+++ b/doc/ostree-static-delta.xml
@@ -49,7 +49,7 @@ Boston, MA 02111-1307, USA.
 
     <refsynopsisdiv>
             <cmdsynopsis>
-                <command>ostree static-delta <arg choice="opt" rep="repeat">OPTIONS</arg> <arg choice="opt">REV</arg></command>
+                <command>ostree static-delta</command> <arg choice="opt" rep="repeat">OPTIONS</arg> <arg choice="opt">REV</arg>
             </cmdsynopsis>
     </refsynopsisdiv>
 
@@ -95,6 +95,8 @@ Boston, MA 02111-1307, USA.
     <refsect1>
         <title>Example</title>
         <para><command>$ ostree static-delta</command></para>
+<programlisting>
         (No static deltas)
+</programlisting>
     </refsect1>
 </refentry>

diff --git a/doc/ostree-summary.xml b/doc/ostree-summary.xml
index f19074fc8901e2b7798d9add7303f12b1c5d4d5b..f193be85447948bcce1e2e8d3e116f5eab2b6e8c 100644 (file)
--- a/doc/ostree-summary.xml
+++ b/doc/ostree-summary.xml
@@ -49,7 +49,7 @@ Boston, MA 02111-1307, USA.
 
     <refsynopsisdiv>
             <cmdsynopsis>
-                <command>ostree summary <arg choice="opt" rep="repeat">OPTIONS</arg></command>
+                <command>ostree summary</command> <arg choice="opt" rep="repeat">OPTIONS</arg>
             </cmdsynopsis>
     </refsynopsisdiv>
 

diff --git a/doc/ostree-trivial-httpd.xml b/doc/ostree-trivial-httpd.xml
index 0b6a30569bfd01602e15af974dec047552191382..1c2427272acb9eef4fc03b47c97b35ffe3909c51 100644 (file)
--- a/doc/ostree-trivial-httpd.xml
+++ b/doc/ostree-trivial-httpd.xml
@@ -49,7 +49,7 @@ Boston, MA 02111-1307, USA.
 
     <refsynopsisdiv>
             <cmdsynopsis>
-                <command>ostree trivial-httpd <arg choice="opt" rep="repeat">OPTIONS</arg> <arg choice="opt">DIR</arg></command>
+                <command>ostree trivial-httpd</command> <arg choice="opt" rep="repeat">OPTIONS</arg> <arg choice="opt">DIR</arg>
             </cmdsynopsis>
     </refsynopsisdiv>
 

diff --git a/doc/ostree.xml b/doc/ostree.xml
index 5a93be695daa16537b59d3a18c0df5d5ea6db9f3..4c333195b959e4cf1887f55f55eeba84ef840aeb 100644 (file)
--- a/doc/ostree.xml
+++ b/doc/ostree.xml
@@ -49,7 +49,8 @@ Boston, MA 02111-1307, USA.
 
     <refsynopsisdiv>
             <cmdsynopsis>
-                <command>ostree <arg choice="req">COMMAND</arg> <arg choice="opt" rep="repeat">OPTIONS</arg></command>
+                <command>ostree</command>
+               <arg choice="req">COMMAND</arg> <arg choice="opt" rep="repeat">OPTIONS</arg>
             </cmdsynopsis>
     </refsynopsisdiv>
 
@@ -93,7 +94,7 @@ Boston, MA 02111-1307, USA.
         </para>
 
         <para>
-              To see the man page for a command run <command>man ostree <arg choice="req">COMMAND</arg></command> or <command>man ostree-admin <arg choice="req">COMMAND</arg></command> 
+              To see the man page for a command run <command>man ostree <replaceable>COMMAND</replaceable></command> or <command>man ostree-admin <replaceable>COMMAND</replaceable></command>
         </para>
     </refsect1>
 
@@ -129,7 +130,7 @@ Boston, MA 02111-1307, USA.
 
         <variablelist>
             <varlistentry>
-                <citerefentry><refentrytitle>ostree-admin-cleanup</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                <term><citerefentry><refentrytitle>ostree-admin-cleanup</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
                 
                 <listitem><para>
                     &nbsp;Delete untagged
@@ -138,7 +139,7 @@ Boston, MA 02111-1307, USA.
             </varlistentry>
 
             <varlistentry>
-                 <citerefentry><refentrytitle>ostree-admin-config-diff</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                 <term><citerefentry><refentrytitle>ostree-admin-config-diff</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
 
                 <listitem><para>
                     &nbsp;See changes to
@@ -149,7 +150,7 @@ Boston, MA 02111-1307, USA.
             </varlistentry>
 
             <varlistentry>
-                 <citerefentry><refentrytitle>ostree-admin-deploy</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                 <term><citerefentry><refentrytitle>ostree-admin-deploy</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
 
                 <listitem><para>
                     &nbsp;Takes a particular
@@ -159,7 +160,7 @@ Boston, MA 02111-1307, USA.
             </varlistentry>
 
             <varlistentry>
-                 <citerefentry><refentrytitle>ostree-admin-init-fs</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                 <term><citerefentry><refentrytitle>ostree-admin-init-fs</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
 
                 <listitem><para>
                     &nbsp;Initialize a root filesystem
@@ -168,7 +169,7 @@ Boston, MA 02111-1307, USA.
             </varlistentry>
 
             <varlistentry>
-                <citerefentry><refentrytitle>ostree-admin-instutil</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                <term><citerefentry><refentrytitle>ostree-admin-instutil</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
 
                 <listitem><para>
                     &nbsp;Utility functions intended primarily for operating system installation programs
@@ -176,7 +177,7 @@ Boston, MA 02111-1307, USA.
             </varlistentry>
 
             <varlistentry>
-                 <citerefentry><refentrytitle>ostree-admin-os-init</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                 <term><citerefentry><refentrytitle>ostree-admin-os-init</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
 
                 <listitem><para>
                     &nbsp;Initialize the
@@ -186,7 +187,7 @@ Boston, MA 02111-1307, USA.
             </varlistentry>
 
             <varlistentry>
-                <citerefentry><refentrytitle>ostree-admin-status</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                <term><citerefentry><refentrytitle>ostree-admin-status</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
 
                 <listitem><para>
                     &nbsp;Show and list the deployments.
@@ -194,7 +195,7 @@ Boston, MA 02111-1307, USA.
             </varlistentry>
 
             <varlistentry>
-                <citerefentry><refentrytitle>ostree-admin-switch</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                <term><citerefentry><refentrytitle>ostree-admin-switch</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
 
                 <listitem><para>
                     &nbsp;Choose a different ref
@@ -204,7 +205,7 @@ Boston, MA 02111-1307, USA.
             </varlistentry>   
 
             <varlistentry>
-                <citerefentry><refentrytitle>ostree-admin-undeploy</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                <term><citerefentry><refentrytitle>ostree-admin-undeploy</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
 
                 <listitem><para>
                     &nbsp;Remove the previously
@@ -215,7 +216,7 @@ Boston, MA 02111-1307, USA.
             </varlistentry>
 
             <varlistentry>
-                <citerefentry><refentrytitle>ostree-admin-upgrade</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                <term><citerefentry><refentrytitle>ostree-admin-upgrade</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
 
                 <listitem><para>
                     &nbsp;Download the latest version for the
@@ -231,7 +232,7 @@ Boston, MA 02111-1307, USA.
     
         <variablelist>
             <varlistentry>
-                <citerefentry><refentrytitle>ostree-cat</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                <term><citerefentry><refentrytitle>ostree-cat</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
 
                 <listitem><para>
                     &nbsp;Concatenate contents of files
@@ -239,7 +240,7 @@ Boston, MA 02111-1307, USA.
             </varlistentry>
 
             <varlistentry>
-                <citerefentry><refentrytitle>ostree-checkout</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                <term><citerefentry><refentrytitle>ostree-checkout</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
 
                 <listitem><para>
                     &nbsp;Check out a commit into a filesystem tree.
@@ -247,7 +248,7 @@ Boston, MA 02111-1307, USA.
             </varlistentry>
 
             <varlistentry>
-                <citerefentry><refentrytitle>ostree-checksum</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                <term><citerefentry><refentrytitle>ostree-checksum</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
 
                 <listitem><para>
                     &nbsp;Gives checksum of any file.
@@ -255,7 +256,7 @@ Boston, MA 02111-1307, USA.
             </varlistentry>
 
             <varlistentry>
-                <citerefentry><refentrytitle>ostree-commit</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                <term><citerefentry><refentrytitle>ostree-commit</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
 
                 <listitem><para>
                     &nbsp;Given one or more
@@ -264,7 +265,7 @@ Boston, MA 02111-1307, USA.
             </varlistentry>
 
             <varlistentry>
-                <citerefentry><refentrytitle>ostree-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                <term><citerefentry><refentrytitle>ostree-config</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
 
                 <listitem><para>
                     &nbsp;Change settings.
@@ -272,7 +273,7 @@ Boston, MA 02111-1307, USA.
             </varlistentry>
 
             <varlistentry>
-                <citerefentry><refentrytitle>ostree-diff</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                <term><citerefentry><refentrytitle>ostree-diff</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
 
                 <listitem><para>
                     &nbsp;Concisely list
@@ -281,7 +282,7 @@ Boston, MA 02111-1307, USA.
             </varlistentry>
 
             <varlistentry>
-                <citerefentry><refentrytitle>ostree-fsck</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                <term><citerefentry><refentrytitle>ostree-fsck</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
 
                 <listitem><para>
                     &nbsp;Check a repository for consistency.
@@ -289,7 +290,7 @@ Boston, MA 02111-1307, USA.
             </varlistentry>
 
             <varlistentry>
-                <citerefentry><refentrytitle>ostree-init</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                <term><citerefentry><refentrytitle>ostree-init</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
 
                 <listitem><para>
                     &nbsp;Initialize a new repository.
@@ -297,7 +298,7 @@ Boston, MA 02111-1307, USA.
             </varlistentry>
             
             <varlistentry>
-                <citerefentry><refentrytitle>ostree-log</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                <term><citerefentry><refentrytitle>ostree-log</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
 
                 <listitem><para>
                     &nbsp;Show revision log.
@@ -305,7 +306,7 @@ Boston, MA 02111-1307, USA.
             </varlistentry>
 
             <varlistentry>
-                <citerefentry><refentrytitle>ostree-ls</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                <term><citerefentry><refentrytitle>ostree-ls</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
 
                 <listitem><para>
                     &nbsp;List the contents of a given commit.
@@ -313,7 +314,7 @@ Boston, MA 02111-1307, USA.
             </varlistentry>
 
             <varlistentry>
-                <citerefentry><refentrytitle>ostree-prune</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                <term><citerefentry><refentrytitle>ostree-prune</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
                 
                 <listitem><para>
                     &nbsp;Search for unreachable objects.
@@ -321,7 +322,7 @@ Boston, MA 02111-1307, USA.
             </varlistentry>
 
             <varlistentry>
-                <citerefentry><refentrytitle>ostree-pull-local</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                <term><citerefentry><refentrytitle>ostree-pull-local</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
 
                 <listitem><para>
                     &nbsp;Copy data from source-repo.
@@ -329,7 +330,7 @@ Boston, MA 02111-1307, USA.
             </varlistentry>
 
             <varlistentry>
-                <citerefentry><refentrytitle>ostree-pull</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                <term><citerefentry><refentrytitle>ostree-pull</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
 
                 <listitem><para>
                     &nbsp;Download data from remote repo.  If you have libsoup.
@@ -337,7 +338,7 @@ Boston, MA 02111-1307, USA.
             </varlistentry>
 
             <varlistentry>
-                <citerefentry><refentrytitle>ostree-refs</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                <term><citerefentry><refentrytitle>ostree-refs</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
 
                 <listitem><para>
                     &nbsp;List refs.
@@ -345,7 +346,7 @@ Boston, MA 02111-1307, USA.
             </varlistentry>
 
             <varlistentry>
-                <citerefentry><refentrytitle>ostree-remote</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                <term><citerefentry><refentrytitle>ostree-remote</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
 
                 <listitem><para>
                     &nbsp;Manipulate remote archive configuration.
@@ -353,7 +354,7 @@ Boston, MA 02111-1307, USA.
             </varlistentry>
 
             <varlistentry>
-                <citerefentry><refentrytitle>ostree-reset</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                <term><citerefentry><refentrytitle>ostree-reset</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
                 
                 <listitem><para>
                     &nbsp;Reset a ref to a previous commit.
@@ -361,7 +362,7 @@ Boston, MA 02111-1307, USA.
             </varlistentry>
 
             <varlistentry>
-                <citerefentry><refentrytitle>ostree-rev-parse</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                <term><citerefentry><refentrytitle>ostree-rev-parse</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
                 
                 <listitem><para>
                     &nbsp;Show the SHA256 corresponding to a given rev.
@@ -369,7 +370,7 @@ Boston, MA 02111-1307, USA.
             </varlistentry>
 
             <varlistentry>
-                <citerefentry><refentrytitle>ostree-show</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                <term><citerefentry><refentrytitle>ostree-show</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
                 
                 <listitem><para>
                     &nbsp;Given an OSTree SHA256 checksum, display its contents.
@@ -377,7 +378,7 @@ Boston, MA 02111-1307, USA.
             </varlistentry>
 
             <varlistentry>
-                <citerefentry><refentrytitle>ostree-static-delta</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                <term><citerefentry><refentrytitle>ostree-static-delta</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
                 
                 <listitem><para>
                     &nbsp;Manage static delta files.
@@ -385,7 +386,7 @@ Boston, MA 02111-1307, USA.
             </varlistentry>
 
             <varlistentry>
-                <citerefentry><refentrytitle>ostree-summary</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                <term><citerefentry><refentrytitle>ostree-summary</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
 
                 <listitem><para>
                     &nbsp;Regenerate the repository summary metadata.
@@ -393,7 +394,7 @@ Boston, MA 02111-1307, USA.
             </varlistentry>
 
             <varlistentry>
-                <citerefentry><refentrytitle>ostree-trivial-httpd</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                <term><citerefentry><refentrytitle>ostree-trivial-httpd</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
                 
                 <listitem><para>
                     &nbsp;Simple webserver.